Updated and added examples
More code and tests