Fixes #9 ; Fixes #10 ; Fixes #11 - eof_ending