Merge pull request #24 from EVS-ATMOS/master

Pull 7/10