Fixed major bug in heuristic and removed some faulty heuristic logic
Merge branch 'selective-deepening'