Merge pull request #32 from R41z/master
authorAaron Marcher <info@nulltime.net>
Thu, 29 Dec 2016 22:27:57 +0000 (23:27 +0100)
committerGitHub <noreply@github.com>
Thu, 29 Dec 2016 22:27:57 +0000 (23:27 +0100)
several bugfixes and general improvements, see commits below.


Trivial merge