Attempt to itegrate with GUI
Merge origin/master into clean-up
Major cleanup
Major cleanup
Merge pull request #5 from vanqyard/clean-up

Clean up