Fixed indentations.
Add missing white line
Translated TODO and FIXME into English
Fixed a few pep8 violations
Fixed a few pep8 violations
Merge pull request #13 from osscca/master

A few small adjustments