Merge pull request #23 from thrimbor/fixes
authorJakob Petsovits <jpetso@users.noreply.github.com>
Fri, 5 Aug 2016 23:00:05 +0000 (19:00 -0400)
committerGitHub <noreply@github.com>
Fri, 5 Aug 2016 23:00:05 +0000 (19:00 -0400)
Fix for VC14 & warnings


Trivial merge