more heuristics
Merge branch 'master' of https://github.com/akbiggs/orbis2014
no message