Fix gcc warnings (for real).
Merge pull request #69 from evoskuil/develop

Fix gcc warnings (for real).