Closes #140