closes issue 1