Issue #51 and #46