Merge pull request #125 from NickStefan/asyncFix

Async fix