Merge pull request #98 from mjohnson541/master

fixing general file converting errors and more analysis