Fixing merge, and syntax errors
Merge pull request #36 from cravacuore/develop

Fixing merge, and syntax errors