Merge pull request #131 from way2muchnoise/1.7-update

cleans up @jakimfett 's mess :p