Merge pull request #8 from terro/master

owner bug