Merge branch 'develop'
Some comments and minor revision
Merge branch 'master' into develop