Merge pull request #54 from dedeckeh/bugfixes
authorSteven Barth <steven@midlink.org>
Thu, 20 Aug 2015 06:12:30 +0000 (08:12 +0200)
committerSteven Barth <steven@midlink.org>
Thu, 20 Aug 2015 06:12:30 +0000 (08:12 +0200)
Fixes compile issues and infinite lifetimes


Trivial merge