Merge pull request #58 from eile/master

Proper cleanup on early exit in zeroconf test
Cosmetics
Merge pull request #59 from tribal-tec/master

Cosmetics
Fix Win32 build
Merge pull request #61 from tribal-tec/master

Fix Win32 build
Cleanups