prepare for merge to master
pep8 fixes