Merge pull request #38 from mikey179/master

more work for 3.1.0
prepare release