Merge pull request #20 from lab41user/master

Updated shell interface
Misc Bug Fixes