Closes #137