PEP8 conventions
Merge branch 'master' of github.com:katur/gunsiano