closes #44
closes #47