Issue#17

This request deals with the fix for ISSUE#17 only .