Added support for Map<String, Object>
Merge pull request #289 from maneeshsahu/develop_2.0

Added support for Map<String, Object>