Use boon to create Map from POJO
Merge remote-tracking branch 'origin/master'