Merging 

Merging dev branch changes to master.