closes #47
closes #47