merge with latest PGB Hello World app