closes #230; closes #229