All upload. 201306 backup
Merge pull request #1 from morris821028/test_branch

All upload. 201306 backup