closes #204
closes #205