simplified logic for the async
Merge branch 'master' of github.com:raptorbird/RAVN