Modified gemspec, Rakefile and Gemfile
Updated Gemfile
Merge branch 'master' into skip_authorization_macro