rails 4
rails 4
Merging lucascarvalho and SecretAgents forks
Merge branch 'release/0.1.0'