version fixes
Merge pull request #400 from kurund/version-fixes

version fixes