Merge pull request #327 from jfoug/master