Atlas redux

Let’s see if it’s ok now.
Merge pull request #539 from mentatzoe/master

Atlas redux