Merge branch 'simulated-annealing-testing'