Merge pull request #20 from EVS-ATMOS/master

Pull 7/8
Merge pull request #76 from gmckercher/master

Merge pull request #20 from EVS-ATMOS/master