gui stuff
Merge pull request #1 from Lizca/master

gui stuff