upgraded to rails4
merge fix