Improved promise support
Merge pull request #1 from tonyennis/20140808

hmmm pull request