Merge pull request #46 from mjohnson541/master

Merge pull request #9 from EVS-ATMOS/master
small stuff
Merge pull request #47 from gmckercher/master

small stuff
Merge pull request #10 from EVS-ATMOS/master

remerging