Merge pull request #490 from joereuss12/object-get-and-put-branch

Merge pull request #490 from joereuss12/object-get-and-put-branch #1335