Fixed object space PR comments.
Merge pull request #428 from est77/master

Fixed object space PR comments.