Merge pull request #512 from Ferada/fix-shell