Fix 18
Merge pull request #26 from bakura10/fix-18

Fix 18