Merge pull request #63 from daivanov/master

PODAM puts nulls into ConcurrentHashMap resulting in NPE
Merged pull requests #60 and #62