Using thread-safe map.
Using thread-safe map.
Merge pull request #281 from 5inGularity/master

Non-thread-safe usage of map can result in infinite loop and 100% CPU usage