make it work with rails 4
merge