Fixed OpenStruct merge issue

OpenStruct options have to be marshalled before attempting
a merge with defaults.
Merge pull request #67 from arax/client-dev

[bugfix] Fixed OpenStruct merge issue