Cleaning up examples
merge with master