Merge pull request #24 from GomZik/master

PEPify code
Issue #20
Change imports order.