Fix #49
Merge pull request #50 from guestisp/fix-49

Fix #49