Merge pull request #328 from jfoug/master