evolution, finally (wout mining)
Merge branch 'evolution' into engine