Merge pull request #23 from EVS-ATMOS/master

Pull 7/9