- Added MASSEMBLY-681
- Enhanced example