manually merge; closes #85