Update to 3.1.2
Merge pull request #30 from jeffdavidgordon/master

Update to 3.1.2