Merge pull request #592 from neheb/bird1