Lots of changes
Merge branch 'master' of https://github.com/lyaunzbe/derrida