Some general fixes
Merge pull request #1 from Mautematico/master

Some general fixes