Begin to work on #219, #220, #221
Merge branch 'develop' of github.com:opencomparison/opencomparison into develop