Added setOption/getOption to service
Merge branch 'develop' into user
Added setOption/getOption to service