Merge pull request #501 from tohojo/bird-205