Fixes Promises, issue #54

Fixes #54