Added grep shell func.
Merge branch 'grep_shell_func' into develop