Merge pull request #210 from hdevillers/master