Add Issues #53, #47, #48