Manual merge. Closes #293