Added more heuristics
Merge branch 'master' of https://github.com/VisionWithGrace/VisionWithGrace