Merge pull request #1 from EricWittmann/master

fixed some warnings found by eclipse