Now supports Promise/A+

Change-Id: I0a687ffbdbdbbede9de58575ea8c3e5f1e90c1c9