Small fixes during reading code.
Merge pull request #74 from KostyaSha/improve

Small fixes during reading code.