fixed memory leak i think, added async
fixed memory leak i think, added async
Merge remote-tracking branch 'origin/master'