unit tests are fixed, pep8 rules are satisfied
Merge pull request #96 from dukhlov/master

unit tests are fixed, pep8 rules are satisfied