Re #3: Reworked shell identification
Merge pull request #4 from nhoening/master

Re #3: Reworked shell identification