resolves #11
resolves #25