Use C99 designated struct initializer (removes warnings on OSX)
Merge branch 'v0.6' into fix-connectTimeout