A few more bits...
Merge pull request #2 from kubawalinski/patch-1

A few more bits from @kubawalinski. Thanks!