Making sure the example code is indented properly.
Merge branch 'master' into develop