Merge pull request #1 from darkmane/master

Cleanup
Temporary GUI

Temporary GUI added
Revert "Temporary GUI"

This reverts commit 9153c9152097136fd9af8aab7d5972a45268acdd.
Reversing an accidental reversal.