Merge pull request #19 from R41z/master
authorAaron Marcher <info@nulltime.net>
Sun, 18 Sep 2016 19:44:48 +0000 (21:44 +0200)
committerGitHub <noreply@github.com>
Sun, 18 Sep 2016 19:44:48 +0000 (21:44 +0200)
several changes


Trivial merge