versioning made better
Merging in versioning changes.