PEP 006 updates
Merge pull request #15 from pmorie/master

PEP 006 updates