resolves #56
resolves #55