Merge "Fix for bug 136 and bug 137."