Merge pull request #145 from way2muchnoise/1.7-update

fixes #84