fixes #92
Merge pull request #97 from way2muchnoise/1.7-update

fixes #92