Merge pull request #232 from Noltari/bird-next