updated version of Benoit
Merge branch 'master' of https://github.com/jackhall/Alexander