Merge pull request #1 from blefaudeux/ben

Ben
Merge branch 'master' into ben