Merge Issue051

Merge Issue051