Fixes #16.
Merge branch 'master' into fixing-16
Merge pull request #26 from ClevelandOnRails/fixing-16

Fixes #16.