finish issue15-5-ryan
Merge pull request #238 from tangren03/new/issue-15-5-ryan

finish issue15-5-ryan