Merge pull request #1 from powderblock/master

Sync with powderblock:master
Improve code style (PEP8 compliance)
Merge pull request #4 from porglezomp/master

Improve code style (PEP8 compliance)