closes #286, closes #287