Updated to work with rails 4.0