Merge pull request #2 from lhasbrou/master

test commit 2