Test and fix for issue #40
Merge branch 'master' of https://github.com/tzaeschke/zoodb.git