manually merge , closes #41