Merge pull request #233 from theJenix/master

missed checkin during external control client on guest