rails 4.1
Merge pull request #6 from actindi/rails-4.1.0

rails 4.1