Merge pull request #269 from way2muchnoise/1.7-update

fixes #268