sync
Merge pull request #22 from Tophans/master

Final Version of GUI