Fixing issues after upstream merge
Fixing issue with maven versioning
Merge pull request #39 from stuforbes/master

Maven versioning issues