Updated master.coffee