This commit fixing issue #11

This commit fixing issue #11