Merge pull request #98 from mjohnson541/master

fixing general file converting errors and more analysis
Merge pull request #31 from EVS-ATMOS/master

Merge pull request #98 from mjohnson541/master