Merge pull request #75 from amco/fix-depracation-errors-on-rails-4

Fix depracation errors on rails 4