Merge pull request #240 from way2muchnoise/1.7-update

fixes #236, fixes #238, fixes #239