added more code comments
Merge branch 'develop'