merged GUI2 with master