Merge pull request #440 from tohojo/bird-203