Closes #124