Merge pull request #30 from daivanov/master

Fix generic types map creation and unit test for that
Merged Daniil changes