Updated observation model
Merge branch 'master' of https://github.com/cnanjo/OneModel