Merge pull request #2 from atom/master
authorHeilig Benedek <benecene@gmail.com>
Thu, 12 Nov 2015 00:20:33 +0000 (01:20 +0100)
committerHeilig Benedek <benecene@gmail.com>
Thu, 12 Nov 2015 00:20:33 +0000 (01:20 +0100)
Update from original


Trivial merge