merge Issue 58