closes #38
closes #53