Merge pull request #2 from qmar/master

Refactoring
Changed GUI