ADDED Async, committed on behalf of @helxsz