(fix) Handle promises
0.0.3