Merge pull request #20 from EVS-ATMOS/master

Pull 7/8