renamed files according to pep8
Merge remote-tracking branch 'origin/master'