Added some comments
Merge origin/master