Bug fix & example update