rails 4.1.7 compatibility
ruby 2.1 compatibility
Merge pull request #44 from informatom/master

Rails 4.1 / Ruby 2.2 compatibility