closes issue 18