Added code for handling edge grammar cases
Merge branch 'master' of github.com:mahmoudalismail/Reporta