Closes #127