Dev

Pulling the new changes to the master branch