Iss 44

Fixes #44 and #43 (kind of).