Fix #34
Merge branch 'prop-cardinality'