Fix numeral
Merge remote-tracking branch 'origin/feature_contract' into feature_contract