Resolving issue 38

This commit resolves #38 :bowtie: