20140601
Merge pull request #10 from morris821028/test_branch

20140601