GUI changealias fixed
Merge branch 'tcp' of https://github.com/tkessels/publicMain into tcp