Critique added by @cbadal
Merge pull request #27 from cbadal/patch-1

Critique added by @cbadal