Merge pull request #3 from atom/master
authorEran Tiktin <etiktin@users.noreply.github.com>
Wed, 16 Sep 2015 15:03:20 +0000 (18:03 +0300)
committerEran Tiktin <etiktin@users.noreply.github.com>
Wed, 16 Sep 2015 15:03:20 +0000 (18:03 +0300)
Update from original


Trivial merge