Fixed a bug?
Merge branch 'master' of github.com:Latexi95/Evolution