resolves #5
resolves #6