Added handling for third party option (both library + sample client).
Merge pull request #9 from fingon/3rd-party-option

Added handling for third party option (both library + sample client).