Merge pull request #35 from cgtx/master

pep8 fixes