In-line ifs are more concise and pythonic.
Merge pull request #3 from rszalski/patch-1

In-line ifs are more concise and pythonic.