Revert "Revert "Resolving issue #31""

This reverts commit dbe0a1bb3acf7c0192bb070f72f76882b6fb0679.