closes #333