Tweaking the contents for issue54
added missing file
Added ownership reference
fixed merge issue