Add issue-10-5
Fix
Merge pull request #147 from objccn/issue-10-5

Add issue-10-5