Merge pull request #378 from ZappoMan/master

Fix compiler warning