closes #207, closes #192