This change Resolves #1 issue