Versioning

Closed Theo Steininger requested to merge versioning into master