Fixing comments
Merge branch 'develop'