Thread-safety and data structures fixes
removed Collection<> references
reverted log labels back
using a linked hash map
Merge pull request #100 from davassi/thread-safety

Thread-safety and data structures fixes
Merge branch 'master' into thread-safety
Merge pull request #101 from davassi/thread-safety

LinkedHashSet in favour of a simple HashSet