Implementation for Issues #10, #11