Merge pull request #3 from atom/master
authorHeilig Benedek <benecene@gmail.com>
Sat, 14 Nov 2015 20:11:26 +0000 (21:11 +0100)
committerHeilig Benedek <benecene@gmail.com>
Sat, 14 Nov 2015 20:11:26 +0000 (21:11 +0100)
Update from original


Trivial merge