Merge pull request #308 from jfoug/master