Closes #143