refactoring, examples, performance improvements.
Merge remote-tracking branch 'origin/master'