Merge pull request #25 from cravacuore/develop

Almost finished Shell
Hard fix, close to death