support non-promise return values and thrown excepctions
1.1.4
Merge branch 'release/1.1.4' into develop