Fix dynamic mapping
Merge branch 'master' of https://github.com/ifaniqbal/Sipenlatif