Merge pull request #304 from jfoug/master