Iss 38

Fixes #38