Merge pull request #3 from JaniM/master

GUI Version 1