merge Issue44