bugfixes and versioning
Merge pull request #16 from tnantais/develop

bugfixes and versioning