Closes #154.