Merge pull request #313 from jfoug/master