Commenting and making things nicer (PEP8)
Merge remote-tracking branch 'origin/master'