Bug fix and more examples