added promised.io
fixed merge