Improve keyboard input routine

* Fix incorrect test for ClientServer and associated bug.

Commit closes #16.