Myles Hosford GUI update
Merge origin/master