Merge pull request #12 from EVS-ATMOS/master

remerging
Merge pull request #51 from mjohnson541/master

Merge pull request #12 from EVS-ATMOS/master