Merge pull request #1 from atom/master
authorEran Tiktin <etiktin@users.noreply.github.com>
Thu, 27 Aug 2015 17:31:20 +0000 (20:31 +0300)
committerEran Tiktin <etiktin@users.noreply.github.com>
Thu, 27 Aug 2015 17:31:20 +0000 (20:31 +0300)
Update from original


Trivial merge