pep8 & various fixes
refactoring
Merge pull request #7 from oczkers/develop

refactoring
Update fixtures.py
refractoring and small fix
Update config.py
Update fixtures.py