Merge pull request #414 from cra0zy/temp
authorHarry <cra0zy@gmail.com>
Sat, 16 Jul 2016 11:20:33 +0000 (13:20 +0200)
committerGitHub <noreply@github.com>
Sat, 16 Jul 2016 11:20:33 +0000 (13:20 +0200)
Extracted commits from #311


Trivial merge