closes issue 5