Revert "Resolving issue #31"

This reverts commit b511d6888eaecd6be23ffd7633cc61d068250a3b.