Merge pull request #1 from FINRAOS/master

Rebase
SearchWorker race condition fix
SearchWorker race condition fix
Merge pull request #45 from mpeter28/master

SearchWorker race condition fix