added new measures
Merge branch 'feature2'
reset
initial
init block and attributes