closes #226, closes #216