Fix indent.
merge.
Fix to work with Rails 4, release version 0.3.0;