Made use of StoppableThread

Signed-off-by: Cormier, Jonathan <jjcf89@gmail.com>
Merge pull request #1 from jjcf89/master

Made use of StoppableThread