Fix #8
Merge pull request #23 from willnet/fix-8

Fix #8