Merge pull request #129 from Nazg-Gul/master
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Tue, 12 Jan 2016 13:30:13 +0000 (13:30 +0000)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Tue, 12 Jan 2016 13:30:13 +0000 (13:30 +0000)
Resolve some compiler warnings


Trivial merge