Merge pull request #13 from EVS-ATMOS/master

Tweaks and fixes
Merge pull request #14 from EVS-ATMOS/master

remerging
Merge pull request #53 from mjohnson541/master

getting rid of problem files