Add atmosphere. Fixes #8
Merge