20140615
Merge pull request #12 from morris821028/test_branch

20140615