- New test
- Changed threaded code to use switch based
Merge remote-tracking branch 'upstream/master'