Sync changes from "stoney" to "master"

I have set it to ```#!/usr/bin/env ruby```