Merge pull request #591 from chitralverma/fix-measures

[GRIFFIN-358] Rewrite the Rule/ Measure implementations