fixes #57
Merge pull request #80 from way2muchnoise/1.7-update

fixes #57