Merge "Bug 52 fixed"