new measures
Merge branch 'feature2'
new calc