closes #236