updated to include rails 4