Merge pull request #48 from big-r81/remove-2.3.1