Code simplified.
Updated sample.
Comments style fix.