Fix reader mode. Resolves #38 and #43.