atom plugin
Merge pull request #2637 from aforty/master

Atom plugin