Fixed #10, #5, #6, #2