Merge pull request #23 from EVS-ATMOS/master

Pull 7/9
Merge pull request #83 from gmckercher/master

Merge pull request #23 from EVS-ATMOS/master