Added wireup.
Updated sample application; fixed NPE.