Added comments
Merge remote-tracking branch 'origin/master'
getting ready to update master
Merge remote-tracking branch 'origin/master'