update history and change erasion to deletion
Merge branch 'master' into alloNotEvo