Merge pull request #142 from way2muchnoise/1.7-update

fixes #33