Merge pull request #160 from fsb4000/warnings