Rails way
More changes
Merge pull request #1 from kasperite/feature/rails-way

Feature/rails way