Fix README, refactor sample, improve style
Make code more consistent
Merge branch 'refs/heads/dev'