Add issue-9-5
Merge pull request #101 from objccn/issue-9-5

Add issue-9-5