Merge pull request #593 from neheb/bird2