Merge "Bug 263 fixed"