Issues #38, #39, #40