Merge pull request #335 from compnerd/warnings

Warnings