Add two examples and Bug fixes