Adapted main for testing
Patched extended main.cpp from parallelized
Fixed endless loop in BuildListOptimizer
Merge branch 'master' into unparallelized