resolves issue #59
resolves issue #60.