Merge pull request #18 from EVS-ATMOS/master

Remerging
Merge pull request #58 from mjohnson541/master

Merge pull request #18 from EVS-ATMOS/master