Make the code more python.
Merge pull request #1 from nikola1/master

Make the code a bit more python.