Merge pull request #123 from prujohn/master

reduced trivial static warns