Fixes #27
Merge pull request #28 from ClevelandOnRails/fixes-27

Fixes #27