Various Changes to Accomodate File Format Changes
Merge pull request #52 from starkfree/master

Various Changes to Accomodate File Format Changes