Merge pull request #30 from EVS-ATMOS/master

Pull 7/21
Merge pull request #31 from EVS-ATMOS/master

Pull 7/21 2
Merge pull request #99 from gmckercher/master

Pull 7/21 3