Changes that were forgotten; Should work now.
Pushed 17/5/14 update