wip
Fix #38
Merge pull request #40 from ddavison/fix-38

Fix 38