including the obvious
Merge pull request #1 from jpillora/patch-1

including the obvious