Changes to ensure threads don't hang, but actually terminate.
Merge branch 'master' of github.com:hirish/Stephanie