Merge pull request #352 from madewokherd/threadinit