Modify GUI Action
merge code from master
Merge pull request #2 from liamcindy/master

merge code from master