[cleanup] necessary fixes to incorporate project
Merge pull request #2 from tkrille/incorporate-shell

[cleanup] necessary fixes to incorporate project