Clean up and examples
Merge origin/master