Update README.md and sample file.
Merge branch 'develop'