Merge pull request #144 from way2muchnoise/1.7-update

fixes #85
fixes #84