Manual merge. Closes #26