PEP8
Fixed typo
Cosmetic fixes
Merge pull request #16 from fmr/master

Fix typo + PEP8