Merge pull request #34 from EVS-ATMOS/master

Merge pull request #105 from mjohnson541/master
Merge pull request #35 from EVS-ATMOS/master

remerging
Merge pull request #112 from mjohnson541/master

remerging