Closes #118