Pep8 fixes and fix traling spaces
Merge pull request #16 from pokoli/pep8_fixes

Pep8 fixes and fix traling spaces