If promise is returned, it should be resolved before continuing
Version bump
Merge branch 'master' into develop