update caveats and examples
Merge branch 'dev'