Merge pull request #4 from fruch/master

Added support for take_control() to work in windows
Minor coding style refinements and touch-ups
add timeout parameter to expect()