Nuke the cat!

Fixes #536
Merge pull request #551 from adamrp/issue536

Nuke the cat!