closes #196, closes #225