Support 1.8.7 outside of Rails context
Merge pull request #7 from oddlyzen/master

Support 1.8.7 outside of Rails context