added comments to the code
Merge branch 'dev'