Merge pull request #315 from jfoug/master