Adding dev branch to master