Merge pull request #10 from EVS-ATMOS/master

remerging
Merge pull request #48 from mjohnson541/master

Merge pull request #10 from EVS-ATMOS/master