Merge dev into master

Part 1 completed