Close #99
delete evolutions
Merge branch 'fix-merges' into development