Using internal versions
Merge pull request #14 from w2ogroup/VersionCleanup

Version cleanup