Eric's stuff
Merge branch 'master' of https://github.com/jbranchaud/jager