Closes #26