testing, from willow branch
Merge pull request #1 from zhoubw/willow_branch

merged from willow_branch