Merge pull request #1 from altliu/branchtest

test
Merge branch 'develop' into branchtest