arg modif example and fixes
Merge commit 'bab1d0248077ef3ee2271cbad6b9aa9c705105dc'