Add issue-5-3
Merge pull request #115 from objccn/issue-5-3

Add issue-5-3