closes #324