fix GUI bug
Merge origin/master