Fix warning and turn on -Werror so future warnings are caught
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from harlequin-tech/master

Fix warning, enable -Werror.