Saved a few lines using a neat trick.
Merge branch 'master' of https://github.com/jahales/BIRD