closes #342, closes #353