Cleaning up code
Merge remote-tracking branch 'origin/master'
__
Merge remote-tracking branch 'origin'