Updated versions to follow Semantic Versioning
Merged version info