Merge pull request #160 from ndawe/master

simplify versioning