PR #52

This is #52 from cprice404's repo copied over with a tweaked Gemfile/Rakefile so I could test it easier.