Revert "Revert "Fixing issue #24""

This reverts commit 2f71f6d262b6b7c8908aa52225431ef475973203.

Revert "Fixing issue #24"

This reverts commit
84eb9c778ff08a4eb723ad4868624f84ce3cb619.