Catching up atmos
Catching up atmos 2
Fixing bug
Merge pull request #109 from gmckercher/master

Small edits