Fixed wrong import mapping and two PEP8 issues
Merge pull request #6 from chadlung/master

Fixed wrong import mapping and two PEP8 issues