Merge pull request #311 from fgaudreault/master