Merge in fix for #39

Fixes #39