still trying to fix #5
committing PEP changes