Merge pull request #22 from EVS-ATMOS/master

Pull 7/8 2