Dev to Master merge

Merging comments to master