20140620
Merge pull request #15 from morris821028/test_branch

20140620