Merge dev branch with master

Merging two branches