Merge pull request #264 from way2muchnoise/1.7-update

decay rework 2