Merge pull request #42 from berkus/master
authorgaryscavone <garyscavone@users.noreply.github.com>
Wed, 3 Feb 2016 21:53:01 +0000 (16:53 -0500)
committergaryscavone <garyscavone@users.noreply.github.com>
Wed, 3 Feb 2016 21:53:01 +0000 (16:53 -0500)
Multiple minor compile fixes with modern C++


Trivial merge