thierry's stuff
Merge pull request #20 from wawiwa/develop

thierry's stuff