Merge pull request #134 from evoskuil/version2

Establish baseline for version2 branch, update versions.