Merge pull request #308 from way2muchnoise/1.7-update

updated oreDict handlers, #305