initial release, for rails 4 only
merge conflicts