Merge pull request #514 from BKPepe/bird