Commit from nitrous.io