linked Charlotte's work
Merge branch 'master' of https://github.com/tdubourg/velov-unchained