Merge pull request #22 from EVS-ATMOS/master

Pull 7/8 2
Merge pull request #81 from gmckercher/master

Merge pull request #22 from EVS-ATMOS/master