GUI Update
Merge pull request #62 from WannabeSid/master

Stuff