Fixes #38 and resolves #32