Merge pull request #17 from EVS-ATMOS/master

Pull 7/7
Merge pull request #64 from gmckercher/master

Merge pull request #17 from EVS-ATMOS/master