Issues #45 and #46