Merging Develop to Master

We will get rid of Develop and move to a single-branch strategy.