Merge pull request #19 from EVS-ATMOS/master

Pull 7/7 3
Merge pull request #75 from gmckercher/master

Merge pull request #19 from EVS-ATMOS/master