Fixes #51 / Fixes #61