Merge pull request #7 from terro/master

owner bug
owner bug