closes #323