Merge pull request #55 from nanliu/tb/containment