Fix some bugs with grep tool and update test cases
Merge branch 'master' of https://github.com/neha01mittal/HRRN