erikmd Merge pull request #435 from llelf/async