improve style
improve style
Fix conflicts
Merge pull request #7 from pure-python/andreit

Andreit