Added comments to master branch
Merge branch 'development'