Merge pull request #292 from way2muchnoise/1.7-update

adds oreDict for mercury, #266