* Tested against Rails 3.2.20, 4.0.11 and 4.1.7
Merge branch 'hotfix/1.0.1'

* hotfix/1.0.1:
  * Tested against Rails 3.2.20, 4.0.11 and 4.1.7