Issue #58: Add the test case
Merge branch 'Issue#58'