Finished second part. Minor fixs
Merge pull request #1 from cravacuore/develop

Finished second part. Minor fixs