closes #75, closes #76