Updated the Atom config
Merged with master