test
Merge pull request #1 from gguan/bugFix

test pull request