Proposed fix for #31

Resolves #31