PEP8 and typos
Merge pull request #172 from rev112/pep8_and_typos

PEP8 and typos