Proofread by Eric
Merge branch 'master' of https://github.com/jbranchaud/jager