Pull request from master to dev: Modifying version number