Issues #20, #21 and #23