Fixed warnings.
Merge pull request #179 from ChrisGrant/master

Fixed warnings.