Stricter PEP8 rules
Merge pull request #19 from rail/pep8

Stricter PEP8 rules