rails4 compatibility and update
Merge pull request #4 from itsNikolay/rails4_and_update

rails4 compatibility and update