GUI Version
Merge branch 'master' into niallsull gui