Merge pull request #231 from folex/develop

Refactor some Awaits out.
Merge remote-tracking branch 'upstream/develop' into develop