Merge pull request #374 from way2muchnoise/1.7-update

things mentioned in #372
fixes #375