...
Merge branch 'master' of github.com:Ambrosys/genetic_programming
manual merge