Add whammy patch

Forgot to include this in the first commit.
Merge branch 'master' into features