closes #320