closes #38