Issue #13: small enhancments