Be more Pythonic and Python 3.x compatible
Merge pull request #19 from alexbutum/master

Be more Pythonic and Python 3.x compatible