closes #47; closes #46