closes #353