Update Develop branch

All development should be done on the develop branch. Looks like it got a bit outdated. Syncing with master branch.