minor
Merge branch 'master' of github.com:tierney/drunken-octo-bear
threaded non blocking working