fix some bug but still have some issue in multithread
Merge branch 'master' of https://github.com/wmin0/Doopey