Updated to ensure it's still working with latest shotgun and shotgun-client.