resolves #16