Made use of StoppableThread

Signed-off-by: Cormier, Jonathan <jjcf89@gmail.com>