add support for stormy weather
Merge branch 'master' of github.com:rsalmond/shenanigans