closes #47
closes #48