Use when instead of es6-promise

Fixes #194