Updates to the sample application. - NM