Merge "fix of Bug 149"