Update sample with comments and to take advantage of the new 0.3.6 features.