Updated Comments
Merge branch 'dev'