This was bugging me.
Merge pull request #314 from seandst/this-was-bugging-me

This was bugging me.