Merge pull request #17 from EVS-ATMOS/master

Pull 7/7