Merge pull request #149 from way2muchnoise/1.7-update

OreDict-stuff, a fix for #148 and updated README