Enhance JavaMapper.
Merge branch 'master' of github.com:UnicoenProject/Junicoen