Merge pull request #321 from fgaudreault/master