closes #211, closes #213