Merge pull request #38 from DustInMonteriggioni/master

Master into Branch-chyb
Heavy modification in sketch to fit the GUI
Merge pull request #40 from DustInMonteriggioni/Branch-chyb

Branch chyb