Merge pull request #39 from sicoyle/fix-threading-and-shutdown

fix: correct thread gathering and shutdown logic to prevent app hang

Author: acroca