added 10.9 support, and fixed control-c for closing server error