Updated comments and fixed typo
Merge branch 'develop'