Merge pull request #159 from way2muchnoise/1.7-update

no more free synthesizing