Merge pull request #39 from jarrah-95/master

bring GUI-Rebuild up to date with 1.0.0
Merge pull request #40 from jarrah-95/GUI-Rebuild

Merge pull request #39 from jarrah-95/master