merged with issue 9