closes #124