Merging new features from dev into master