refactoring, add options hash to client_data
Added as option for builders
Merge branch 'release/0.1.0' into develop