Merge pull request #86 from AndrewEdwards/master

Improve versioning