Promises: incorporated feedback, Fixes #1