closes #38
closes #39