finish 15-4
Reviewed
Merge pull request #244 from objccn/new/issue-15-4-Onetaway

finish 15-4