Added a few comments
Merge origin/master
Added more comments