Corrected sample code
Merge branch 'v2.3' into issue4