gligneul Merge pull request #3 from gligneul/issue-2