Merge pull request #354 from justinweiss/move-to-thread-api