20140309
Merge pull request #2 from morris821028/test_branch

20140309