Update samples. Fix bugs
Fix review notes.
Fix review notes.
Minor fixes.
Merge pull request #296 from onepf/sample_fix

Update samples. Fix bugs