Merge pull request #76 from Noltari/bird-next