Some commenting.
Merge branch 'develop'