Merge pull request #45 from tcomte
Merge pull request #45 from tcomte