Merge pull request #154 from way2muchnoise/1.7-update

fixes #132