added some code examples
fixed typo
Merge branch 'dev'