- added logic to evaluate measures
- added first Count and Average measure implementation