new heuristics added
outgrowth of new heuristics
estimating function changed from enum to String
estimating function changed from enum to String
fixing
Merge remote-tracking branch 'origin/ala' into ala
estimating function again
fixing
Merge pull request #2 from wttek/ala

accepted