closes #352