Closes #125