Merging changes to master

Merging branch to master