Made changes to work better with Mochascript 0.2