Fix build warnings.
Merge pull request #30 from timharley/master

Fix build warnings.