Use /usr/bin/env ruby instead of /usr/bin/ruby
Merge branch 'master' into 2