Merge pull request #118 from sbliven/master

Minor fixes for parsing old or non-standard files