Merge pull request #312 from jfoug/master