Merge branch 'issue-22' into 'develop-v2.1.1'

closes #22, simplify modeling of confidence level on observations

Closes #22, #32, and #33

See merge request !24