Fix #9 - Replace expr with grep for matching