Fixes #22 kind of
Merge pull request #37 from ilabafrica/Fix-for-22

Fixes #22 kind of,