Closes #145