parameterize measure properties, allow for optional additional props
Merge branch 'categories_with_optional_properties'

Rebasing and merging pull request #173