per #30
resolves #27