Adding the ability to specify a version to the application
Fixing merge conflict