updates
added owner way
Merge origin/master