Merge pull request #24 from EVS-ATMOS/master

Pull 7/10
Merge pull request #84 from gmckercher/master

Merge pull request #24 from EVS-ATMOS/master