pulled in new version of Benoit
Merge branch 'unstable' of https://github.com/jackhall/Alexander into unstable