Patch 1

Fix for issue #1 
Setting keepTracking = true no longer starts a timeout that can not be canceled.