closes issue 14
closes issue 14