Merge remote-tracking branch 'moschlar/master'
Improve PEP8 compliance
Merge branch 'upgrade-2.7'

Thanks to @moschlar