Working on chapter 5 and some SDK 0.4.x changes
Removing accidental VLC commit