Fix #47
Merge pull request #48 from matiboy/47

Fix #47