Merge "Adjust standalone example so it works"