fixed PEP 8 complaints
Merge remote-tracking branch 'origin/master'