Merge "Bug 44 fixed."