added comments
Merge origin/master