This closes #127