Working on #17
Fix #17: Use ConcurrentHashMap instead of thread-local storage
Merge branch 'feature/thread-local-storage' into develop