fix some bugs
Merge remote-tracking branch 'origin/master'
merge from master
Merge remote-tracking branch 'origin/master'
Update: move ui processing to the main thread
Merge pull request #8 from Issic47/master

fix some bugs