Atlas back to normal
Merge branch 'master' of https://github.com/bagedevimo/pxljm