Added Rails4 support