Fixes #5 Atmosphere 2 module

Test cases must be added later