Merge pull request #7 from Jirsch/corners

Corner heuristic
Merge branch 'master' into corners