As generated by pylint
Merge pull request #3 from timp21337/tpp20130930

As generated by pylint