Fix varie
Merge pull request #20 from francarl/master

Fix varie