issue #58

issue #58
Merge pull request #63 from koketso122/master

issue #58 only half solves the problem