Added comments and made things better
Merge remote-tracking branch 'origin/master'