Correcting #86. Solving issue 1
Merge pull request #88 from infograf768/isuue1

Correcting #86. Solving issue 1