Issue #162 Implementation

Added ConcurrentHashMap to improve performance.