Merge pull request #133 from fsb4000/warning