Issues #31, #38, #18, #54, #47, #34