closes #152
Merge pull request #153 from way2muchnoise/1.7-update

closes #152