resolves #11
resolves #6