Merge branch 'develop'
added type mapping in readme
Merge branch 'master' into develop