closes issue 11