Merge pull request #344 from way2muchnoise/1.7-update

moar refactoring