Merge pull request #84 from gmckercher/master

Merge pull request #24 from EVS-ATMOS/master
Merge pull request #25 from EVS-ATMOS/master

Merge pull request #84 from gmckercher/master