Moved to rails 4.1