Updated
Merge pull request #5 from fabaff/shell

Updated