Merge with master (from Genetic Algorithm)