Issues #14, #13, #12, #11, #10, #7, #6, #3