Merge pull request #32 from EVS-ATMOS/master

Pull 7/29
Catching up atmos
Catching up atmos
catching up atmos
Merge pull request #103 from gmckercher/master

Atmos Work