Atmos work
Merge pull request #101 from gmckercher/master

Atmos work