Merge pull request #76 from gmckercher/master

Merge pull request #20 from EVS-ATMOS/master
Merge pull request #21 from EVS-ATMOS/master

Merge pull request #76 from gmckercher/master