Merge pull request #1 from atom/master

Merge