Added conditions to check for in the shell
Merge pull request #2 from RVB32/master

Added conditions to check for in the shell