resolves #54
resolves #52