Bug fixes and additional examples