Merge pull request #9 from way2muchnoise/1.7-update

runs in 1.7.10