Merge pull request #2 from roselone/master

update
wjy

gui
Merge pull request #20 from purejade/master

update GUI