Added comments
Merge origin/master