Fix PEP8 and #18
Merge pull request #20 from agoragames/pep8

Fixes PEP8 and #18