closes #259, closes #258