Avoid compiler warnings.
Merge pull request #550 from oliverschmidt/master

Avoid compiler warnings.