Issues #14, #15, #16