Fix example code
Merge branch '0.3'