Merge pull request #12 from EVS-ATMOS/master

remerging