Merge pull request #186 from stintel/bird