feature1
new measures for feature2
Merge branch 'feature2'