bugfix for FR merge but w/ performance regression; test cases
Merge pull request #63 from uci-cbcl/wbiesing/bugfix-for-fr-merge

bugfix for FR merge but w/ performance regression; test cases