Merged changes from dev to master branch

Merge from dev to master