Changes suggested by https://github.com/rails-api/rails-api