Fix #51
Merge pull request #52 from guestisp/fix-51

Fix #51