This commit fixing issue #11

This commit fixes issue #11