misc
Merge pull request #17 from Clodo76/master

misc