Synced away from c9

One copy for Github