resolves #15
resolves #15