Merge pull request #1 from dreamteam69/master

Pull in GUI class