Replace with bean
Small changes
Merge pull request #190 from SEEG-Oxford/243-object-mapper

Object mapper