Some comments added
Merge branch 'develop'
Commented a little