20140504
Merge pull request #6 from morris821028/test_branch

20140504