Edited sample application to test the framework