Merge pull request #325 from jfoug/master