Merge pull request #362 from way2muchnoise/1.7-update

We all make mistakes. Sometimes, they're more obvious than others.