Changed some identifier names; added a new heuristic function
Merge branch 'master' of github.com:mewcs/alpha