closes #53
closes #48