Iss 36

Fixes #36