Merged in the two sample applications.