Fixed issue with await inside nested statements (#126)
Merge branch 'develop' into future