20140522
Merge pull request #9 from morris821028/test_branch

20140522