Merge pull request #85 from marcoscaceres/promises

Promises
Merge remote-tracking branch 'upstream/gh-pages' into markup_issues