resolves #8
resolves #7