A bit more pythonic
Merge pull request #1 from skhaz/master

A bit more pythonic