Merge pull request #247 from Noltari/bird-next