Fixing merge, and syntax errors
Added doble dispatching
Clean directory for code send, and now shell fixed
Merge pull request #38 from cravacuore/develop

Ready to send, fixed shell.. Milestone 2