Merge pull request #12 from EVS-ATMOS/master

pull 6/30 2
asldkfasdf
Merge pull request #49 from gmckercher/master

asjkdlf