Fixed issues (again \!)
Merge branch 'master' of https://github.com/theCmaker/shell