Some minor changes to resolve a few warnings and a few code style issues.
Merge pull request #5 from FreekDB/master

Some minor changes to resolve a few warnings and a few code style issues.