Modifies simple flatfile parser
Merge pull request #12 from g-weatherill/fixes_nov14

Modifies simple flatfile parser