Applied few bug fixes. Added related json sample.