Manual merge. Closes #217