Bug fix + added examples