manually merge; closes #84