20140624
Merge pull request #16 from morris821028/test_branch

20140624