Include missing files for GUI
Merge pull request #2 from eode/master

Include missing changes from GUI