Almost finished Shell
Merge pull request #25 from cravacuore/develop

Almost finished Shell