Merge pull request #326 from retro-wertz/silence_warnings