Merge pull request #133 from plntyk/fix_bird