merge gui4
Merge pull request #125 from Tokanagrammar/merge_gui4

merge gui4