Updates

Extensions and changes in the framework and the examples.