Merge pull request #140 from way2muchnoise/1.7-update

fixes #129 and #138