Updated the version in relation to the new minor features
Merged branch