Dev

Updating the master branch to the latest stable version of the code