updated master
added gui