Solving the issue #49

@joe-linden
Merge pull request #50 from Faryshta/patch-1

Solving the issue #49