closes #341