merging in pep8 branch with pep8 implemented