Dev branch

Merges DevBranch and master