Issue #46
Issue #54, #53