Fixed a few compiler warnings.
Merge pull request #1 from adib/merge/mwaters/master

Fixed a few compiler warnings.