Merge "Bug 65 resolved."