Fix usages of python's basic features.
Merge pull request #2 from DePierre/master

Fix usages of python's basic features.