Add issue-5-7
Merge pull request #140 from objccn/issue-5-7

Add issue-5-7