Modification from c9.io