Updated sample to element-handler branch
Updated to framework master