closes issue 7