Merge pull request #142 from hdevillers/master