Merge pull request #378 from tohojo/bird-2.0