Make it work with new format.
Merge branch 'master' of github.com:mythmon/dove