Fixed conflicts
Merge pull request #17 from HallCat/extraGUI

Fixed conflicts